Clarify the code, gcc 4 complains about predecrement in MAX().

2005-06-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child):
	Clarify the code, gcc 4 complains about predecrement in MAX().

diff --git a/ChangeLog b/ChangeLog
index 1c7b2030dcd7fac9f2e6b9b46e3042669c56478d..385763a09e5dda392a1d208479ac4fc9cd9cff95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+       Clarify the code, gcc 4 complains about predecrement in MAX().
+
        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
        prematurely unregister callbacks. 
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c7b2030dcd7fac9f2e6b9b46e3042669c56478d..385763a09e5dda392a1d208479ac4fc9cd9cff95 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+       Clarify the code, gcc 4 complains about predecrement in MAX().
+
        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
        prematurely unregister callbacks. 
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1c7b2030dcd7fac9f2e6b9b46e3042669c56478d..385763a09e5dda392a1d208479ac4fc9cd9cff95 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): 
+       Clarify the code, gcc 4 complains about predecrement in MAX().
+
        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
        prematurely unregister callbacks. 
 

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index ca68253c2aefc12d50ab6da3084129ec3ec80b19..d786d55fa9c2b559fbd1820a24e621734d637cee 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -827,7 +827,10 @@ gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter,
   g_array_insert_val (level->array, i, elt);
   *index = i;
 
-  for (i = MAX (--i, 0); i < level->array->len; i++)
+  if (i > 0)
+    i--;
+
+  for ( ; i < level->array->len; i++)
     {
       FilterElt *e = &(g_array_index (level->array, FilterElt, i));
       if (e->children)